popupMenu: Remove support for nested combo boxes

I'm sure this was originally a testcase for nested child
menus, and we never actually inteded any support for this.

https://bugzilla.gnome.org/show_bug.cgi?id=693572

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 5123696f332b738a2d1d92c3c8b68dd5658e1089..eb3bd3076fcf5a7d6c0aa6f026b79dcc899b07d5 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1682,9 +1682,7 @@ const PopupComboBoxMenuItem = new Lang.Class({
     _getTopMenu: function() {
         let actor = this.actor.get_parent();
         while (actor) {
-            if (actor._delegate &&
-                (actor._delegate instanceof PopupMenu ||
-                 actor._delegate instanceof PopupComboMenu))
+            if (actor._delegate && actor._delegate instanceof PopupMenu)
                 return actor._delegate;
 
             actor = actor.get_parent();